T21: small changes