[CHG] small changes