Fixed some other errors