Final filename fixes