Minor fixes from refactoring