Fix escaping file names in some places