Fixing some file paths issues