More watchdog, fixed small bugs.  openscholar/openscholar#3168