More craft fixes