Code revie

Badi, can you please take a quick look at the most recent bug fix (executable being specified as WQ task input file twice) and see if it looks fine?