Some fixes due to fix build