Fix for failing ITs