Merge fixes

I have no idea why this didn't take...