More Fixes
thx Fabian

Signed-off-by: PandariaEmu <d4rk31m0@gmail.com>