Upgrade WW to 3.3.1 & Tmpl to 1.0.4