Some minor fixes that reduced the number of timeouts