Cleanup

Change-Id: Ic7831165a1354ae2329cc0f4a62778c0052cb7a0
Misc. Fixes

Change-Id: Iec7854936ba9460cac6f772841166f55c3e2b68f