Improved memory issues