Various fixes
Merge remote-tracking branch 'chaos/master' into wotlk