Assorted fixes

Change-Id: I372d9d3bf8ab9cc8f474aea78e68be3c38f85238
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
5 files changed