Fix some mistakes
Merge.