Sources were slightly modified to compile with -Werror

 -Arun Sharma (aruns@google.com)