Stability fixes for Statistics.java