Fix the annotated issues