Fixes wrt. Hermes merge.
More fixes needed for new Hermes to work.
Updated Hermes.