[HELIX-238] Assorted fixes