Fixing refactoring errors.