Address review comments

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>