Patch Set II - Memleaks