Fixed additional annotation errors
Merge remote-tracking branch 'wup_orig/master'