C++11 Fixes.

Change-Id: Iefb6f32b5715f390da8fa599ad163a3d89b5363d