Minor uncrafting tweaks.