Try to fix build errors