Capella Days 2021 - Some fixes

Change-Id: I1426804215b613a8b6aab691ead543fe8374d18d
2 files changed