Fix build CF2 build error