fixes after refactoring to match patterns