Adjustments according to comments on #3575