Tweaks on Create Endowment