fix some build test issues