fix build errors and updated defconfig