Fixed some bugs with annotation.