Fix paths, add better messages