Fixed some old annotations