Ruler fixes