Improving timeout handling
Post-NewsHack push