Fix timeout stuff

...this is all it needed? That doesn't look right.