Fix based on peer review on string internationalisation & timezone