WoL patch + various interim changes