fixes due to refactoring