Add quoting and fix set command