Some minor variable updates

Signed-off-by: Stanley Lai <stanleylai.sg@gmail.com>