Fixes after last part of refactor