Cleanup dispatcher / fix redirected output mode !