Fixes to new changes in defconfig