Minor fixes after refactoring