More fixes for tempest run