Fixes for string handling.