fixes for refactor