Merge "Improve compiler stats"