Fix bits missed during refactoring