Apply upstream client fixes
Improve and fix extras additions to snappy ticket