Fix a few more

Change-Id: I045e3278e2f9632fb190baa2fe53fcb623da8e12