k1om: some fix-ups