some tweak to build system