Fixing some path issues