Fixed refactoring errors.