Two unrelated annot changes