Merge pull request #1218 from TheBlueMatt/2021-12-minor-bindings-tweaks