Quoting fixes