Fix dependency tracking for maps