Fix up the annotaions