Fixing Gem stuff