Minor fixes
Restore to watch config