More defconfig adaptions