Fix more files not found problems