Product Tag - fix leaks