Minor fixes after refactoring.