Minor optimisations, enforce two digit date
ntp server change