Some changes to fix build