Misc. fixes that never made it back in, after my last repo purge.

Change-Id: I