Gems and other changes