Small uniformity fixes.