More ItemView fixes