Minor fixes missed during refactoring