fix build, add annotations