Compile fix for ARM
Merge pull request #223 from krf/arm-fixes

Compile fix for ARM