Improve RiskWsServer building