fixes to get the build going inside helium