295 unbreak annotator standalone

This is the other side of the "unbreak annotator" task. 
On this side, it's only a few changes to follow the API necessary changes.

Handle this together with the other PR for annotator.