kr_disunity: Various fixes