fixed build for end2end