Small post-merge fixes.