UPDATE: minor fixes of other components
UPDATE: minor fixes of other components

h2020-westlife-eu/west-life-wp6,h2020-westlife-eu/west-life-wp6,h2020-westlife-eu/west-life-wp6,h2020-westlife-eu/west-life-wp6,h2020-westlife-eu/west-life-wp6,h2020-westlife-eu/west-life-wp6,h2020-westlife-eu/west-life-wp6