CS fixes for DDC-3006