stylus watcher fixes