More changes for debugging the situation