Hopefully fix most of the errors and warnings from the last push

Change-Id: I1a466b2d55f120796910039a0296ca324c58e891
8 files changed