more fixes on item spawn