Fix more label variables