More Crypto changes