More typing changes