ENH: Merged changes from helium run

This pull in some more robustness changes
from the latest data processing run on helium.