some final tz fixes