Minor memory adjustments
merge