Fix some thing
Merge branch 'hsy0130' into wip