Tweaks while trying to straighten out tz.