Fixing some bugs in the port of helpers to this utils class