Crypto improvements