Some fixes after refactoring