Some fixes to get to build