Fix more missing variables

@makasim Are we good now?