Fixing more type related parse issues