minor changes needed

Change-Id: I395b2215bcb3dd6e4ab8c6e40d32ce8efb0969af