unwatch and untail fixes
pkg