Fixing specs and CS