Fix refactoring oversights