Got rid of KSS and other fixes.