fix build errors / warnings