Increase recovery wait timeout to 30 seconds