Some more memory leak avoidance