Changes to Gem and Gemlock