Fixes for new Hermes.