Another attempt to fix build errors