Update helpers to avoid compatibility issue with other Froggy modules