Bug fixes after refactoring