annotations fixups