Apply minor fixes to PBKDF2 recommendations (#2248)