Fix shell quoting for third party commands