Other Kconfig and Makefile updates