Update to latest CSLib changes