Try to fix build issues