Some changes to gems