a2020 little fixes

Change-Id: Ibbc2d9059c5a694dfe204eca6ec003fdbfef6be2