diff --git a/py/desispec/scripts/proc_tilenight.py b/py/desispec/scripts/proc_tilenight.py
index 79aeab186..0305f39f7 100644
--- a/py/desispec/scripts/proc_tilenight.py
+++ b/py/desispec/scripts/proc_tilenight.py
@@ -72,10 +72,10 @@ def main(args=None, comm=None):
 
     #- Set the eligible laststep values for different processing steps
     if args.laststeps is None:
-        prestd_laststeps = ['all', 'fluxcalib', 'skysub']
-        jntpst_laststeps = ['all', 'fluxcalib']
+        prestd_laststeps = jntpst_laststeps = ['all', 'fluxcalib']
     else:
-        prestd_laststeps = jntpst_laststeps = args.laststeps
+        prestd_laststeps = args.laststeps
+        jntpst_laststeps = list(set(['all', 'fluxcalib']) & set(args.laststeps))
 
     #- Determine expids and cameras for a tile night
     keep  = exptable['OBSTYPE'] == 'science'
diff --git a/py/desispec/workflow/desi_proc_funcs.py b/py/desispec/workflow/desi_proc_funcs.py
index 0d9b8bf9c..8c21eaae2 100755
--- a/py/desispec/workflow/desi_proc_funcs.py
+++ b/py/desispec/workflow/desi_proc_funcs.py
@@ -139,12 +139,8 @@ def add_desi_proc_tilenight_terms(parser):
                              + "(e.g. all, skysub, fluxcalib, ignore); "
                              + "by default, exposures with LASTSTEP "
                              + "'all' and 'fluxcalib' will be processed "
-                             + "to the poststdstar step, and those with "
-                             + "LASTSTEP 'skysub' to the prestdstar step. "
-                             + "If specified, exposures with LASTSTEP "
-                             + "values in the list will be processed to the "
-                             + "poststdstar step, and all others will not "
-                             + "be processed at all.")
+                             + "to the poststdstar step, and all others "
+                             + "will not be processed at all.")
 
     return parser