Fix some minor remarks from the pull-request-reviewers