small type hinting fixes