Fixed some mistakes from previous commits