Fix collectors in new configuration