More pesky folder name problems