solving a few PRs sent by users