Performance tweak and profiling