Fixes from code reiview.
Merge pull request #210 from cschroed-usgs/NAWQAAN-287

Fixes from code review.