Some small leak cleanups

cmr=v1.8.3:reviewer=artpol