Kaba: corrections, -m no more needed