- Fixed memory issues