Attempt to fix build errors