tpaskhalis More quote fixes