Fix issues from PR on netbackup collector