Defconfig: Several updates to match with KK changes