Merged WBE fixes

Merged the WBE fixes from STEP+Core+Patch.esp from Nearox to the main
patches.