Big updates to underlying gems