Some Gem changes