Final WS241 updates