fix for typed address issues
Added Memory Leak tracking contribution from Nick Ring.