Try some CSC modifications
-- These may need to be applied in the csc directory