Fixed a couple of issues that cropped up

Almost look like bad merge...