Fix string handling for gcc 7