More IT corrections (client) #10039 #10370