minor fixes from the merge