Post-merge conflict fixes.
Fixes from recent merge mess.