Fixes on defconfig