Fix crafting.

fixes #4620, mostly.