Fix some mistakes