Fix some tiny problem.
merge