Fix compilation failures on ARM (Issue #237)
More ARM fixes
Merge pull request #238 from kripton/armfix

Fix compilation failures on ARM with GCC 4.8.2