More typing improvements