Fixed some of the previous errors