Helper fixes

couple fixes in the helper classes