Fix weak-cryptography issues