Fix annotation & comment date