fixes to helper classes