Fixes after tempest rebase