Bethsoft WIS additional fixes prelim