Fix bugs.
Merge branch 'wzp-local'