Fix some problems with string construction.