Fix issues with overloaded methods