Attempts to fix build errors