More quote fixes