Fixes for Tempest CI