Fixes on Watches list