Changes for compiling on Linux