Fix path changed bugs