resolves two compile errors and test failures