Watch fixes (handle config replacement)