Fixing things after refactoring