Fix CQL bugs such that CLI install works.