[HELIX-73] fix build failures