Better handling of private/dir/launcher option