Gem updates and some other minor tweeks