fix a couple of things omitted during the update merging