Try and fix the timeouts on the semaphore wait.