More changes and debugging related to IT