These changes look good to me.