Small fixes

Change-Id: I3b24a50b29ada9a74111f5360bcd22872e564d17