Make MyPy happy

karprequested to merge
make-mypy-happy into master

Fixes for various type errors throw by mypy.

Merge request reports