TBD-1306: fix problems of other MapR versions.