Some project updates to fix build issues