Fixing bugs with the annotation driver