Trying to fix build problems