C++11 Fixes.

Change-Id: I7efdae20c0ad58923d4c34969ef02a944d0c50d2