Fix various bugs.

Change-Id: I46e3001e6857480a77253be24b1753b2e4d88e69
3 files changed