Number and date formatting fix