IIT network specific fixes