Bug fixes to ARUPAnnotate.