Fix some mistakes in here