Various fixes reflecting the changes in risklib