More Merge-Fixes