A few performance/memory usage updates