More Mkisan fixes