String related fixes.