DB/Misc: Misc fixups in Shattrath