Ruler labels and calc fixes