(Hopefully) C++11 Fixes.