Fix typo in last commit and replace string::pop_back call for now as it's not supported in some older gccs.