Minor fixes for the merge.
Minor fixes for merge.
Merging fixes.
Quick fixes for merge.