Fixed few time-out issues