Fix Counselor, update watch-resources