Fix warnings

Change-Id: I1fcea07fe43815ca8f0e3e32db1a68c27b4332af