Fixed some mistakes