Update version and fix defconfig