fix some folder problems