multiple definition fix and defconfig update