Fix options to support --work-dir, -W