Add folder bug fixes