Some fixes to builds