Fix some mistakes
Fix some errors