fix build errors. there will be more
more fixing