Minor changes on Echo and Transformer