C++11 issues finally fixed...