CRYPTO: Fix more AES build errors