Added more quote replacements