Further fixes for getting tempest to pass