fixes for the new overloading resolution