Fix some require issue
mend
mend