Updates for NSB V5 and typo fixes. See issue #462