Minor changes to echo commands