Update Defconfig for recent changes