Fix two more instances of bad type hinting