Minior fixes for kmom07