Merge "Fix string breakage."