Several fixes for annotations including one major one that prevented annotations from working properly.
Refs #2525

Change-Id: If78270265605d83ce64eca7654126329f36df0d7