Fixes after annotation migration