CL module production issues fix and stabilization