Fixes after epic refactor