It looks as though some of your warnings fixes snuck in here. You should make this pull request only about the ring.