Fix view modification WindowWatcher, minor fixes