A lot of fix for follow up the changes of PEG4d.