Several minor 1.20/21 fixes (#2711)* Several minor 1.20/21 updates* Fully fixup boat type deprecation* Wording (commit: 38b35c3)