Tools:fix output paths