Fixing up the last few merge conflicts