fix potential quoting/word-splitting issues