Fix paths and echo