Upgraded to latest version of AES to deal with more warnings