Some fixes to build