WIP: Fix bugs i make while working on other 2.0 PRs #26

Closed
vaporvee wants to merge 3 commits from polish-2.0 into main
No description provided.