Fix some error
Fix errors