Fixed Some errors