Re: minor tz tuneups and portability fix