Small fixes for helios generators