Updated Gems and fixes according to new gems