Fix several optional typing issues

[ngieseker]

Submit a pull request

There's a few instances of the default being set as None but the typing not properly marked as optional to correctly set typing.

CLA

• [ x] I have signed the Stream CLA (required).
• [x ] The code changes follow best practices
• [ x] Code changes are tested (add some information if not applicable)

Description of the pull request