More fixes for item parsing.