fixed issues due to recent c client changes.