Slightly better item stack handling