Gem tweaks