more filename fixes