small changes that got lost in the merge