fix minor errors
Merge branch 'hotfix/fix_some_errors'