Changes for producing correct dates on annotations