More fixes

Change-Id: I869fc94ac4e97f56cbb0449588ccccee958cc1ad