Fix for compilers w/o C++11 uniform initialization