tweaks to work against new refactored service
Merge branch 'master' of https://github.com/nitrogenjs/client