Overload fixes