Fix major erros