Some fix and optimization for build