Fixing some gems