More type hinting fixes