more _.Function fixes
more _.Function fixes