Forking ``cql`` to patch some stuff