small fixes (which are gone in migration to web0.3)
small fixes (which are gone in migration to web0.3)

MjAbuz/watchdog,MjAbuz/watchdog,ferranti/watchdog,aaronsw/watchdog,ferranti/watchdog,MjAbuz/watchdog,MjAbuz/watchdog,aaronsw/watchdog,aaronsw/watchdog,ferranti/watchdog,ferranti/watchdog