Various build/Kconfig cleanups