Fixes for number formatting and localisation tweaks