Fix more relative path issues