more fixes.

Change-Id: I59d5ce096894c3c6847b3bce00db0797b9c2c72d