Bugfixes, watchdog evaluation