Add some basic timeouts so we can't block forever