some fixes to get hatests running on CI