Fixed some errrors