Buildscript : prepare for CM compat