More minor changes for compilation on Linux