More fixes to types