Fix more missing variables

hm, `$this->xxx` looks strange IMO....