a few fixes in helpers