Defconfig fixes for CS integration