Minor memory management change