Script and KConfig Fixes