Scatter-348, 360, 361 - Fix double slash problem in file paths