[PATCH] NIST reference fixes