merge small fix PRs