Trying to get compiling against CsiStandard
Clean compile against CSI libs.