Minor cleanup of PRs