[3.8] Conf fixes