Added timeout escapes for the wait loops surrounding the synchronization points.