[GEM-dev] Gem fixes in Pd-extended