Some minor fixes
Merge pull request #534 from nla/nn-dsc-337

Some minor fixes