Fix another set of quoting problems