Changes for compiling on linux