Minor fixes after latest refactoring.