Fixing file path issues