NX-536 Making changes to errors found during task.