Fixes for past merged PRs