Minor fixes; escaping, quoting, grouping, ...