Fix path and remote