Shell quoting fixes