Fix build + AES changes