Feature/nist source

Two minor fixes