Changes from compiling on linux using GCC