More refactorings and fixes in Helios-Helpers