fix build errors / clean up