Some item related fixes.