Minor tweaks to try and reduce timeouts