fix some issues around annotations overrides that are numbers
Merge branch 'grant-date-fix' into testing