fixes to ensure tests pass