Fix regression issues