Some provider and tooltip changes