C++11 Fixes... please... I beg of you...