Timeout bugs fixed