Crypto: Small fixes