Post-refactoring fixes.