Add cancel wait to call buffer
Add 30 second timeout to long poll handler