Quest/operation markers that won't go away even though completed.

So I have two quest marking exclamation points in Skyhold that won't go away.  These are for the rogue specialization quest and mark where the trainers were.  I completed the quest, yet the exclamation points marking where the two trainers I did not use are still showing up on the map.  The trainers have moved locations, so the exclamation points lead to nothing.

The more annoying one though is on my War Table.

Awhile back I completed an operation that dealt with checking out some weird chalk images...or something.  I completed the operation via Secrets.  The advisor is back and has gone on many operations since.  i got the reward.  But the marker is still on the table and highlighted as "In Progress".  These kind of issues drive me crazy because I like to clear my maps.  But this one also worrys me because I know some of these operations have multiple well....operations.  And I wonder if maybe this specific one does and I will not ever be able to keep going down the line if it forever shows as being "In Progress".

So anyone know of a fix for this?

I mean I doubt it.  Seems like both instances are just weird glitches. 

And it in no way ruins this amazing game for me or anything.

But I sure would love to clear these off the map and War Table.

Xbox One if that matters.