fixes to gf upgrades and map issues