Fix path conponents