Fix some more issues with special chars