Small fixes to Item listener