More memory improvements.