Fix two "missing dispose" issues

Change-Id: I28e6d9dd5bc95102b73ae84afe33a1136ac6a22c