Minor Echo fixes