more type hinting fixes