Fixes as discussedon IRC

GCLI fix and documentation upgrade.