tz 17, small fixes