Fixed some erros