Other fixes for special characters

5 jobs for master in 2 minutes and 35 seconds (queued for 11 seconds)