Some additional memory improvements.