Fix: path issues