Fix ownership of gss values issues