Update ChangeLog.  Fix small timeout issues.