Fixes for 5.4.1 (FUCK YOU BLIZZARD)