WS241 production fixes