Minor changes to cql files