Minor changes to the Crafter, to ensure everything works fine.