Fix build & update defconfig