WSOTWO-91: small fixes