Some Werror stuff fixing

Change-Id: I6fbcf7168480590c1922e6f4ccd180e1605086dd