Fix warnings that are now reported as errors

Change-Id: I5769acd4748644d453cb220a74d418a502fbe758