Fixes to recent PRs