Fixed low hanging fruit exposed by profiler