Fixes to CSL plugin