Quotation fixes