Moving to the more general form of document watching
Fix for events being fired off