minor stub fixes

I ran [mypy stubtest](https://mypy.readthedocs.io/en/stable/stubtest.html) and fixed any issues it found. Not adding it to tox because it has lots of false positives without any way to silence them (except passing a large allowlist via the CLI)