More bugfixes to WW3