Review fixes r=rhelmer