Fixing merge issues.
Fixing refactoring errors.