Fixes for weekly, and better handle disconnects.