Fixes to the GEM