Fix mismerges when cherry picking fixes