More bugfixes with C++11 compliancy