Minor Kconfig Gov Cleanup