More AES fixes