MT#9177 More fixes.

Change-Id: I6be6892434bf9ec93feac35537921a34a1f10990