PostMerge Fixes

Cleanup of a few post-merge bugs.