Added some missing calls to register the watching functions