Fix the annotation schemas