dev: fixes due to refactoring