Fixed build on gcc/Linux after my OSX Changes