Changes to fix build errors