Some errors solved