Minor memory tweaks