Some timeouts fixes and hacks