Misc post merge/pull fixes.