Additonal fixes for compilation on Linux