Fixes to build on Linux (64-bit Arch Linux)