fix some more stuff

Change-Id: If27cb5c6c101eb47ed67a78a875d36b8b0e0c939