inor bug fixes
Merge https://github.com/leonard990/gsn-client