Tweaks
Fixes to reflect client gem changes