CRA-534: Fixed some warnings related to merging with nrlib.