Fix up quotes by using wrapper script