Final tweaks to WOM