Minor Type Fixes