KMM 1.0 (small fixes)