more list type correctness

Change-Id: I97cc37c05782b6ab2cd7b8b63a4315ba2386f1ef