More quoting fixes