Fix dispatcher. Fix watch_loop when used with roles.