Make klist cope with OoM situations; Improve c++ compatibility