Provider small fixes