Fixed some oversights from the previous round of refactoring