Fix some variables

Couple of fixes

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>