Fix path builder