fixed some more compile errors and test failures