Added double-quote fixes