aggregated small commits

c80f4e1 r=huonw