[NEED REVISION] tweaks to compile in C++11 mode