more changes to fix build errors/warns