Fixed other merge issues.