Several fixes to e.g. annotations.