fix for -u NORC and tests.

coverity issues