Fix most errors

Change-Id: I33f200041138a492bd2f7b9af66f490e1312d5fc