Some memory improvements...