Some fixes for compiling the new things on linux