added minor changes (missed in the merge)