Watched and fix some