SNAP pipeline fixes (in progress)