Re: Int21 fixes - Update