Currently we use PBKDF2 to derive the AES key for encryption/decryption. A better alternative would be scrypt, or the HKDF from whatever HMAC function we end up choosing.