Fix minor issues preventing compiling on Linux