BLOCKER: Fix #437 Fix #435

This blocks the next PR that will be the final EBI submission via GUI. :smiley: