pull-review influenced fixes