[MRG] Some more minor changes