Mage Trainer Issue

[Cass]

I've just hit level 14 and it's telling me that I have mage skills I can learn.

I select the option to find the closest mage trainer and it guides me to Elissa Dumas in Darnassus.

Elissa is only a portal trainer and does not appear to have any of the skills that I can upgrade/buy.

[ZG Support 1]

I think it hasn't been updated yet for wrath changes. It should point to Emissary Valustraa who should be standing there right next to Elissa.

[Cass]

I managed to find the trainer in the same building, but she's upstairs, pretty much directly above Elissa - I assume she was moved again

[Cass]

Same issue again (this time with Paladin Trainer) with the guide telling me to speak to Baatun in Azuremyst Isle near The Exodar. There's no NPC there for skills.

*edit* They are in down The Exodar, but the arrow was pointing to a location at land level.