Some performance improvements

Some performance improvements, that made overload work twice faster according to existing benchmark.