* Small annotations fixes