Fixed some string splitting issues.