More changes to linux compiling