Fixes for watch/unwatch on prod, added bug for dev