Fixing up shell quoting issues