Changes to compile cleanly on Linux Mint 17