Minor fixes/cleanup
Fix broken watchdog (it used to max out one core entirely)