Re: Two tzcode fixes