Fix the data paths