Fix bad echo calls (#22)