Fixed memory management conflicts