facebook · Cyan4973 · Jan 25, 2015 · Jan 25, 2015 · Jan 25, 2015
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
- **ZSTD**, short for Z-Standard, is a new lossless compression algorithm, which provides both good compression ratio _and_ speed for your standard compression needs. "Standard" translates into everyday situations which neither look for highest possible ratio (which LZMA and ZPAQ cover) nor extreme speeds (which LZ4 covers).
+ **Zstd**, short for Zstandard, is a new lossless compression algorithm, which provides both good compression ratio _and_ speed for your standard compression needs. "Standard" translates into everyday situations which neither look for highest possible ratio (which LZMA and ZPAQ cover) nor extreme speeds (which LZ4 covers).
 
 It is provided as a BSD-license package, hosted on Github.
 
@@ -13,7 +13,7 @@ For a taste of its performance, here are a few benchmark numbers, completed on a
 |---------------|-------|---------|---------|
 |               |       |   MB/s  |  MB/s   |
 | [zlib 1.2.8 -6](http://www.zlib.net/)| 3.099 |    18   |  275    |
-| **ZSTD**      |**2.872**|**201**|**498**  |
+| **zstd**      |**2.872**|**201**|**498**  |
 | [zlib 1.2.8 -1](http://www.zlib.net/)| 2.730 |    58   |   250   |
 | [LZ4 HC r127](https://github.com/Cyan4973/lz4)| 2.720 |   26    |  1720   |
 | QuickLZ 1.5.1b6|2.237 |  323    |  373    |
@@ -22,24 +22,24 @@ For a taste of its performance, here are a few benchmark numbers, completed on a
 | [LZ4 r127](https://github.com/Cyan4973/lz4)| 2.084 |  370    | 1590    |
 | LZF 3.6       | 2.077 |  220    |  502    |
 
-An interesting feature of ZSTD is that it can qualify as both a reasonably strong compressor and a fast one.
+An interesting feature of zstd is that it can qualify as both a reasonably strong compressor and a fast one.
 
-ZSTD delivers high decompression speed, at around ~500 MB/s per core.
+Zstd delivers high decompression speed, at around ~500 MB/s per core.
 Obviously, your exact mileage will vary depending on your target system.
 
-ZSTD compression speed, on the other hand, can be configured to fit different situations.
+Zstd compression speed, on the other hand, can be configured to fit different situations.
 The first, fast, derivative offers ~200 MB/s per core, which is suitable for a few real-time scenarios.
-But similar to [LZ4](https://github.com/Cyan4973/lz4), ZSTD can offer derivatives trading compression time for compression ratio, while keeping decompression properties intact. "Offline compression", where compression time is of little importance because the content is only compressed once and decompressed many times, is therefore within the scope.
+But similar to [LZ4](https://github.com/Cyan4973/lz4), zstd can offer derivatives trading compression time for compression ratio, while keeping decompression properties intact. "Offline compression", where compression time is of little importance because the content is only compressed once and decompressed many times, is therefore within the scope.
 
 Note that high compression derivatives still have to be developed.
 It's a complex area which will certainly benefit the contributions from a few experts.
 
 
-Another property ZSTD is developed for is configurable memory requirement, with the objective to fit into low-memory configurations, or servers handling many connections in parallel.
+Another property zstd is developed for is configurable memory requirement, with the objective to fit into low-memory configurations, or servers handling many connections in parallel.
 
-ZSTD entropy stage is provided by [FSE (Finite State Entropy)](https://github.com/Cyan4973/FiniteStateEntropy).
+Zstd entropy stage is provided by [FSE (Finite State Entropy)](https://github.com/Cyan4973/FiniteStateEntropy).
 
-ZSTD development is starting. So consider current results merely as early ones. The implementation will gradually evolve and improve overtime, especially during this first year. This is a phase which will depend a lot on user feedback, since these feedback will be key in deciding next priorities or features to add.
+Zstd development is starting. So consider current results merely as early ones. The implementation will gradually evolve and improve overtime, especially during this first year. This is a phase which will depend a lot on user feedback, since these feedback will be key in deciding next priorities or features to add.
 
 The "master" branch is reserved for stable release and betas.
 The "dev" branch is the one where all contributions will be merged. If you plan to propose a patch, please commit into the "dev" branch. Direct commit to "master" are not permitted.

diff --git a/lib/fse.c b/lib/fse.c
@@ -195,9 +195,9 @@ static void FSE_writeLE64(void* memPtr, U64 val64)
 static size_t FSE_readLEST(const void* memPtr)
 {
     if (sizeof(size_t)==4)
-        return FSE_readLE32(memPtr);
+        return (size_t)FSE_readLE32(memPtr);
     else
-        return FSE_readLE64(memPtr);
+        return (size_t)FSE_readLE64(memPtr);
 }
 
 static void FSE_writeLEST(void* memPtr, size_t val)

diff --git a/lib/zstd.c b/lib/zstd.c
@@ -382,7 +382,8 @@ static unsigned ZSTD_NbCommonBytes (register size_t val)
             return (__builtin_clzll(val) >> 3);
 #       else
             unsigned r;
-            if (!(val>>32)) { r=4; } else { r=0; val>>=32; }
+            const unsigned n32 = sizeof(size_t)*4;   /* calculate this way due to compiler complaining in 32-bits mode */
+            if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
             if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
             r += (!val);
             return r;