Begin fixing breaking changes resulting from refactoring