annotation generator fixes