Fix assert
Convert Heli to better constants handling