Fixing some erros