T37: small changes