fix a couple things that cropped up during merging