Minor Fix of echo statements