Review comments

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>