Changed or added timeouts to try to prevent CI hangs