Fixes following changes to org and g-client