Try to fix path issues