Fix some mistakes again