Changes to deal with dots in directory names