Fix 2 merge issues.
Fix 2 merge issues.