[MRG] minor changes