Fix Some errors