More fixing of folder fixes