Modify wrong codes.
Merge pull request #3812 from nutty898/develop_nutty_modify_wrong_codes

[ci skip]Modify wrong codes.
various other changes