Fixes as suggested by GH reviewers