Fix some CSL mappings