Some fixes for building in C++11 mode.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>