Fixed CSRP issues.