Fixes in function and method overload