Fix some additional mistakes caused during merging.  All seems to be fine now