Various corrections.

Change-Id: I2c453d4389784eb7c8d7cdb22f6b44955b8a0b38