Fix watcher (Although it still does nothing)
Fixes for SessionControl things I got wrong