fixes in helpers