Fix more missing variables