Hopefully fix build issues