minor fixes
Merge branch 'comp_daskws' of git://github.com/vidma/cmsdist into comp_daskws