Fix undefined variables

Followup to I2b0a7648c

Change-Id: Ic34628bf37f2ea280aae335662af5e5d0bd3a6c4