fix build problems