Additional fixes to KPM