fix memory leak(s)

Change-Id: I2a407cf499f995fe080d855bd18fef41e93fa52c