Fixed a couple of things that did not auto-merge correctly.