fixes to work with helium cloud