Fix PRs, push hot fixes