Changes required for GPhL workflow

We tested the GPhL workflow today and a couple of changes need to be merged.