Fixes for ITs