Merge pull request #1006 from dalkon/master

Stackable items fix
Small stuff

Also yet another thing I missed for the stackable items fix.