Trying to fix build issues