[Items] Fix some more bugs.
[Items] More code, less bugs.