Fixed some of the errors