Some defconfig celanup and sync