Small changes to make WATCH_UNORDEREDMAP work