Small typing updates