Minor tweaks for numbers