Fix helpers issues