Fix missing var and explicitly instantiate lists