Updated two remaining gems