Fixing annotations