Some minor fixes for the Linux build