Fix passing raw options into external commands