Craft fixes