[DarkmoonFaire:] Fixes