nicki: misc updates to defconfig