Fixed some watch list interactions