Added more fixes for folder name issues.