Filename bugfixes