Some missed merge fixes

These are some things that must have gotten lost in the back and forth