Fix some more errors

Change-Id: Idc1cd956bd817ff80d24c389dcc8e95c3713fe05