Other fixes for special characters

4 jobs for master in 2 minutes and 33 seconds (queued for 10 seconds)