Fixes after refactoring.