More folder fixing