MatkaCmd some other fixes