Fix a few issues with item parsing.