I think those changes sound fine.