Some fixes for the build