Fix more dir problems