Minor improvements to Item validation.