Fix path references and some pipe cleanup