Fixing path issues