[12322] Fixed Errors resulting from Cmangos Merge

Fixed a few merge errors that i missed during the main merge from
CMangos