Timeout stuff fixed