Minor Type fixes