Source changes to fix build