More filename fixes