Kconfig: various changes