Secure memory fixes